Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

finish RegionKind renaming #117908

Merged
merged 3 commits into from
Nov 15, 2023
Merged

finish RegionKind renaming #117908

merged 3 commits into from
Nov 15, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Nov 14, 2023 •
edited
Loading

second step of rust-lang/types-team#95

continues the work from #117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR:

  • rewrite the RegionKind docs, they still talk about ReEmpty and are generally out of date
  • rename DescriptionCtx to DescriptionCtxt (already inconsistent)
  • what is CheckRegions::Bound?
  • collect_late_bound_regions et al
  • erase_late_bound_regions -> instantiate_bound_regions_with_erased?
  • EraseEarlyRegions visitor should be removed, feels duplicate

r? @BoxyUwU

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Nov 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@lcnr
finish RegionKind rename
15f2156 
- `ReFree` -> `ReLateParam`
- `ReEarlyBound` -> `ReEarlyParam`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
BoxyUwU
BoxyUwU reviewed Nov 14, 2023
View reviewed changes
compiler/rustc_infer/src/infer/free_regions.rs Outdated
assert!(r_a.is_free());
assert!(r_b.is_free());
debug!("lub_param_regions(r_a={:?}, r_b={:?})", r_a, r_b);
assert!(r_a.is_late_or_early_param());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be reasonable to just call this is_param() I feel like that wouldn't be a confusing name

compiler/rustc_infer/src/infer/mod.rs
///
/// FIXME(@lcnr): This can also store a `DefId`, similar to
/// `TypeVariableOriginKind::TypeParameterDefinition`.
RegionParameterDefinition(Span, Symbol),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this used for late and early bound parameters?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only early bound, copied he name from TypeVariableOriginKind

@lcnr
Copy link
Contributor Author

lcnr commented Nov 14, 2023

@bors r=BoxyUwU rollup=never p=1

@bors
Copy link
Contributor

bors commented Nov 14, 2023

📌 Commit 8fcbd19 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 14, 2023

⌛ Testing commit 8fcbd19 with merge 3da0593...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2023
@bors
Auto merge of rust-lang#117908 - lcnr:region-kind-rename, r=BoxyUwU
3da0593 
finish `RegionKind` renaming

second step of rust-lang/types-team#95

continues the work from rust-lang#117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR:
- rewrite the `RegionKind` docs, they still talk about `ReEmpty` and are generally out of date
- rename `DescriptionCtx` to `DescriptionCtxt`
- what is `CheckRegions::Bound`?
- `collect_late_bound_regions` et al
- `erase_late_bound_regions` -> `instantiate_bound_regions_with_erased`?
- `EraseEarlyRegions` visitor should be removed, feels duplicate

r? `@BoxyUwU`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 14, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 14, 2023
@lcnr
Copy link
Contributor Author

lcnr commented Nov 15, 2023

@bors p=1 r=BoxyUwU

@bors
Copy link
Contributor

bors commented Nov 15, 2023

📌 Commit 18281d3 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 15, 2023
@bors
Copy link
Contributor

bors commented Nov 15, 2023

⌛ Testing commit 18281d3 with merge 316629e...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2023
@bors
Auto merge of rust-lang#117908 - lcnr:region-kind-rename, r=BoxyUwU
316629e 
finish `RegionKind` renaming

second step of rust-lang/types-team#95

continues the work from rust-lang#117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR:
- rewrite the `RegionKind` docs, they still talk about `ReEmpty` and are generally out of date
- rename `DescriptionCtx` to `DescriptionCtxt`
- what is `CheckRegions::Bound`?
- `collect_late_bound_regions` et al
- `erase_late_bound_regions` -> `instantiate_bound_regions_with_erased`?
- `EraseEarlyRegions` visitor should be removed, feels duplicate

r? `@BoxyUwU`
@bors
Copy link
Contributor

bors commented Nov 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 15, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@BoxyUwU
Copy link
Member

BoxyUwU commented Nov 15, 2023

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 15, 2023
@bors
Copy link
Contributor

bors commented Nov 15, 2023

⌛ Testing commit 18281d3 with merge 1500db7...

@bors
Copy link
Contributor

bors commented Nov 15, 2023

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 1500db7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2023
@bors bors merged commit 1500db7 into rust-lang:master Nov 15, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 15, 2023
@bors bors mentioned this pull request Nov 15, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1500db7): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.7% [0.6%, 0.8%] 2
Regressions ❌
(secondary)		 3.8% [3.8%, 3.8%] 1
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 2
Improvements ✅
(secondary)		 -2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) 0.1% [-0.4%, 0.8%] 4

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 673.093s -> 674.821s (0.26%)
Artifact size: 311.10 MiB -> 311.10 MiB (0.00%)

@lcnr lcnr deleted the region-kind-rename branch November 15, 2023 16:44
@fmease fmease mentioned this pull request Mar 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BoxyUwU BoxyUwU BoxyUwU left review comments

Assignees

@BoxyUwU BoxyUwU

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
6 participants
@lcnr @rustbot @rust-log-analyzer @bors @BoxyUwU @rust-timer